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

Change-Id: If65a96ce942fc3dffc631945c03233aee8914616