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

* commit '96ef96b563c94c1f4a7949b590246b6f255e2b76':
  ShortcutManager: finishing touches

Change-Id: I8bc506551a116cb21fb2eeb1d6adf77995c85415