Merge "Introducing ShortcutManager" into nyc-dev