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

Change-Id: I37d6ca7d9578f6862d50e262d402caf3f2337cb1