Merge "Revert SurfaceView background implementation." into qt-dev