chore: merge origin/main, resolve admin-layout-catalyst test conflict

Both branches fixed the same test (admin-only menu items need admin user).
Kept main's inline approach, removed redundant adminData fixture.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: lane711