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

Change-Id: Ie7b8cc494961bc3106a1a7836d6d6c778f2be22f