Merge "Correct SurfaceView background visibility."