Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev am: fe99773a70
am: 7b2bcd0410

Change-Id: I9deaf6b8740be2b162a452b3a06183edcb56fd7b