Merge "Clarify geometry management for SurfaceView"