Merge "Keyboard shortcuts: one instance refactor" into nyc-dev