Merge "Fix SurfaceView Background" into pi-dev