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

Change-Id: I41bb04676fd23fc968db37417b2cfc5c51aede20