Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev