Merge "Keep track of the WCT changes to determine the transition type" into tm-qpr-dev