Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev