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':
Change-Id: I6f8735658bac7d8dc54a9d15ca622acc1b9abdcd