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