Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev