Fixed an issue where the background could show in a wrong way am: d381bc3133 am: 3ff0c5b3ce
am: d59911c6a2

Change-Id: I0652e069ccd63a1ba47152a09ba7fec990b788aa