Merge "Fix DemoMode icon spacing" into pi-dev