Merge "Update surface size even when preserving geometry." into nyc-dev
am: a004ed7

* commit 'a004ed7789fd3d9a2d11a5019a463ea5572629b0':
  Update surface size even when preserving geometry.

Change-Id: I7d75a1f10cf100e9b54122d20e4535ecdbaad9ef