Merge "Set background on correct view" into nyc-mr1-dev
am: bbbe658ea4

Change-Id: If0d4c8183ba9eaf98c968204f294499a1e897a54