Merge "ShortcutManager: First cut of CTS" into nyc-dev