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