Merge "ShortcutManager demo: Manifest shortcuts + API renames" into nyc-mr1-dev