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

Change-Id: I88f17c51cb020ed30b771a1bebfa565640f262fc