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

Change-Id: Ia2b517ad9e66e19621397f45b1f8d704b429bc7a