Merge "Adjust background image scrims to avoid square effect" into pi-car-dev