Merge "Merge "Revert SurfaceView background implementation." into qt-dev am: cd58d5a512" into qt-dev-plus-aosp
am: 8c1d083a61

Change-Id: Ifb2a80192ab60e0039d4d186766bb8f61200cf59