Merge "Clean up SurfaceView"