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

Change-Id: I1f02f607593fbf9adcaae6cf92bb5ec559bcaa21