Merge "Remove ShortcutManager" into nyc-dev