Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev