Merge "Don't allow shortcuts with non-main activities" into nyc-mr1-dev