Merge "Adjust background image scrims to avoid square effect" into pi-car-dev am: 8143fe7a16
am: c5c43e57fa

Change-Id: Id598c82f69bb45aa81fc8faed19fb762107b3cfd