Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev