Merge "Include embedding activity change in transition" into tm-qpr-dev