Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev