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

Change-Id: Ib0af0fcb8a7ff12538d1e8901e48e2ce7075d0e4