Merge "ShortcutManager: finishing touches" into nyc-dev
am: 7d164d35a4

* commit '7d164d35a41d2aa351f0a27faf05fc67ba262c07':
  ShortcutManager: finishing touches

Change-Id: I00b4f95180faef45f18b5ca3ddfa714e97424aa0