Merge "Do not change surface properties when waiting for transition to ready"...
Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev am: cd2b4303
am: 5fbc6680
* commit '5fbc6680':
Do not change surface properties when waiting for transition to ready
Change-Id: I2d1debebed8877ee7292cbff43e7da92faaf9e3a