Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f41 am: 7cc2b1f1 Change-Id: I7b51bd9cc80d24198c0e1995a87184d51a61b814