Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev am: bcedd6b74f
am: c56ff7d5e2

* commit 'c56ff7d5e230e80f89721593232c0ef0ce1ef14f':
  Fix silent errors when launching Keyboard Shortcuts from Settings

Change-Id: I1a194ea2a87b22d7b8c7475b914e92aecc57f5fc