Merge "Merge "Fix DemoMode icon spacing" into pi-dev am: ee18fb2112" into pi-dev-plus-aosp
am: f5f2c674d9

Change-Id: Ibb174bcd48e48e535bb4cf407445fa072c340f83