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: c76d149e
* commit 'c76d149e':
Change-Id: Ibfbc9eb735778e34ed74791161118f34eaa0aefe