Merge "ShortcutManager: API rename" into nyc-mr1-dev