am 916cd977: (-s ours) am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

* commit '916cd9770ce865bad98f15a68be74f3aa607e727':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""