Merge "Set background on correct view" into nyc-mr1-dev am: 1525e4e377
am: 04c227b054

Change-Id: Iafa2a993a571f1966ef06939babd8368b6620717