Merge "Spread out portrait background image scrim" into pi-car-dev