Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev