Merge "Hide more shortcut APIs" into nyc-mr1-dev