Merge "Keyboard shortcuts: UI polish 2" into nyc-dev
am: bf8207e

* commit 'bf8207e270b1af908278b7a58c33a3e16d425cac':
  Keyboard shortcuts: UI polish 2

Change-Id: I8430559d65a7ad9748692bb779efd016e49518fe