Merge "Treat setup wizard default home as null." into tm-qpr-dev