Merge "Continue deferring removal of activities in a transition" into tm-qpr-dev