Merge "Cleanup handleActivityCreated" into tm-dev