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

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

Change-Id: I43938e09b83271cf48ddfe6bb6f956332f415c18