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

Change-Id: I219e4809a6a9f839353e049d4d563ece37866ca2