Merge "Shortcut: Only "main" activities can have shortcuts." into nyc-mr1-dev