Merge "Remove unused SurfaceView state."