Merge "Restore new SurfaceView background implementation." into qt-dev