Merge changes I9ff5e6fd,I753c0ba0

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