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: Ibf8c2c90a3728500b660bacc9a55434e2f82f104