Merge "Fix activity leak bug" into tm-qpr-dev