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