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