Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev