Merge "Spread out portrait background image scrim" into pi-car-dev am: ed885f864c
am: 261edf2dad

Change-Id: I3e955346902b019002edabeb05b5d4b23a0f9269