Merge "ShortcutManager: finishing touches" into nyc-dev