am 0b6c8f59: (-s ours) Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev

* commit '0b6c8f599cf33abfe9cd3fe5ea8d0411bbb475c2':
  Do not start tasks on ActivityViews unless explicit. DO NOT MERGE