Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev
am: e2be9f4

* commit 'e2be9f4a670198edbe9b1c42422d6d429b8a21f6':
  ShortcutManager: Categories should be Set, not List.

Change-Id: Icd32225f6a2e05cc4157343d2ab9adb16d1c6348