Merge "SurfaceView: Remove dead code" into rvc-dev