Merge "Enforce onActivityReparentedToTask" into tm-qpr-dev