Merge "Keyboard Shortcuts: Add Keycodes for shortcut representation" into nyc-dev