Merge "Introducing ShortcutManager" into nyc-dev
am: ed58f5f0aa

* commit 'ed58f5f0aa580dd4a6dc0fd5dc957862309db8d9':
  Introducing ShortcutManager