Merge "Reinstate SurfaceView Background from N" into oc-dev