Merge "Revert "Pretend to be having the original background"" into qt-dev