Merge "Disallow starting activities without new task from non-activity context."