Set background on correct view am: def71dc084
am: 2ece92286d

Change-Id: Icd264a6bc890a8a9465465cceff3ee450a194291