Merge "Repin home once setup is complete" into pi-dev am: 31e9d9d32b
am: 106ae23742

Change-Id: Ifb4856b92c21146a4326a52112745b6b16822cb6