Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev
am: cd2b4303ce

* commit 'cd2b4303ceedfc4afa7c0d5d1349b22fc9927173':
  Do not change surface properties when waiting for transition to ready

Change-Id: Ib4ee5117c7d02fa8fc2a1454972c84f2849ea6a6