Merge "Make Keyboard Shortcuts special names Context dependent" into nyc-dev