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