Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev