Merge "Revert "DO NOT MERGE Revert "Fix activity leak bug""" into tm-qpr-dev