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

Change-Id: I8c9b101c5f6122f5c09ba786393fbec4590fd1e3