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

Change-Id: I5a4e8a5c8c45add308b115bc447f85393d572e00