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