Revert "Set background on correct view" am: e0df1ae2d3
am: 7c72b7692d

Change-Id: I6885eaaba8df58cb4e6e9e877237b3cd3df429c9