Merge "ShortcutManager: Address API review feedback." into nyc-dev