Merge "Revert "Disallow starting activities without new task from non-activity context."" into oc-dev