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: d9c92e13
am: 1a99bcd8
* commit '1a99bcd8':
Do not change surface properties when waiting for transition to ready
Change-Id: I96b75ea6451a7b0de71f843ebce95a1a3c3adc02