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

Change-Id: I76a9594d70f1b1eafa3fb29e87e9ba7250f472fc