Merge "Merge "Don't update default home before system is ready." into qt-dev am: a22e313768 am: 8de3030ca8" into qt-r1-dev-plus-aosp
am: 8621f9f507

Change-Id: Ibbcdd74a4244229a4f79fb50e22b16d640c82f48