Set background on correct view am: 1ad6282d03 am: 05808cb042
am: 4d3e596a33

Change-Id: I8d96f0a066dd8cb89008c4051ab8fe319da50212