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

* commit '59cfcb502d0907af2b4645dc79466541378fefb6':
  ShortcutManager: finishing touches

Change-Id: I20552fe48cf9f87787747324c6c8144d9b555318