Merge "Unfreeze the surface when the transition is done" into tm-qpr-dev