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

* commit '7d164d35a41d2aa351f0a27faf05fc67ba262c07':
  ShortcutManager: finishing touches

Change-Id: I565dace9a52645fab1e1f419b8a9bec3b2b64517