Merge changes from topic "am-305841d3a12f484cb47e8cb052459474"

* changes:
  [automerger skipped] Merge "Run transition when app dies in freeform" into tm-qpr-dev am: 0c50e33c -s ours am: bb5fd995 -s ours am: a5ad6e30 -s ours am: 403141f3 -s ours
  [automerger skipped] Run transition when app dies in freeform am: cdb03b30 -s ours am: 7bef4ea7 -s ours am: 52d70ed7 -s ours am: 33317a54 -s ours