Merge "Pretend to be having the original background" into qt-dev am: f9363aadeb
am: cd60bc92a4

Change-Id: I31b1f353cddb2239631f47a159ac9bb98cbb9bc2