Merge "Revert "Set background on correct view"" into nyc-mr1-dev
am: 0000262ec6

Change-Id: I4349b6fd539be4a1de416ef218bf28f65ace003e