Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev