Merge changes from topic "am-a46fd4bdbabd4371819d0ff28d19e910"

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE Revert "Fix activity leak bug""" into tm-qpr-dev am: a424fc32ca am: e37c62ff60 -s ours
  [automerger skipped] Revert "DO NOT MERGE Revert "Fix activity leak bug"" am: b9ed093976 am: 8aa4c1e0d3 -s ours