Merge "ShortcutManager: Extract helper classes." into nyc-dev