Merge "ShortcutManager: add remaining APIs." into nyc-dev