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

Change-Id: I5b98f0c7c35bd690f42faae8d68b3592ed7ec91b