Merge "Fix up ModifierShortcutsTests to use test bookmarks.xml" into main