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

Change-Id: Iee4293b4210a5d100af4f9a49f7bcaeae4272d12