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

Change-Id: I1b2e721e0bb44c35c49d8d983bc6b5a3e7a73d3d