Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev