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