Merge "Disallow starting activities without new task from non-activity context." into oc-dev
am: 3ebe54b3e6

Change-Id: I4a89ce60dad32f41f4e77b81a6af56c89845987a