Merge "Keyboard shortcuts: UI polish 1" into nyc-dev