Merge changes Icf1215c2,I3c8edef0,Icebd94f8

* changes:
  WindowState: Fix transaction usage in preserve surface
  WindowState/WindowStateAnimator: Remove cropping
  WindowStateAnimator/ViewRoot: Move surface resizing to client