Merge "Merge "Revert "Disallow starting activities without new task from non-activity context."" into oc-dev am: 367b880c am: 272b3903"