Merge "Reinstate SurfaceView Background from N" into oc-dev am: 71044d6ba1
am: 6f0f995120

Change-Id: I69cf4465b8900abea6e4e803b0d2c1cd033a0635