Merge "Revert "Clarify geometry management for SurfaceView""