Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev
am: a9f262d649

* commit 'a9f262d649fd1b3b1980a564facc4f1388c541be':
  ShortcutManager: Implement max # of shortcuts

Change-Id: I6105a20eb6d8f3840e826ec91bc8db68fdc33e44