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

Change-Id: I8b085f6d3a0bfbef1988a860da8a76c21f44faf6