Merge changes I9bf357f3,Ia83b74fc

* changes:
  Revert "Call prepareSurfaces in applySurfacesChangesTransaction"
  Revert "Revert "Revert "Avoid setting size/position on Transaction if not needed"""