Merge "Merge "Don't update default home before system is ready." into qt-dev...
Merge "Merge "Don't update default home before system is ready." into qt-dev am: a22e3137 am: fbd8c742" into qt-r1-dev-plus-aosp
am: 86c6bc11
Change-Id: I326159f6dd3ff03e94f2d2319a35aaab2be4f577