Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev