Merge "Shift to keycode and modifierState attrs in bookmarks.xml" into main