Merge "Unfold transition - Apply based on state" into tm-qpr-dev