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