Merge main and resolve conflicts in RemoteInstancesPage.tsx (re-applied the width bumps by hand at their current locations) and KeyboardShortcutsSettings.tsx (dropped the PR's hunk entirely: main replaced that fixed-width input with ShortcutRecordingDialog, which has no equivalent clipping at 200% interface font size). Closes #2320