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