Merge "Do not remove/hide surface when waiting for transition start" into sc-v2-dev