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

Change-Id: Id851101f4c67727c0dce98e6a27f47d4a09996be