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

Change-Id: Ifce54c5b7c817b2fc625b6363980e877eea4d8ea