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