Merge "Fix default home detection logic" into qt-dev am: 21cb9f03cf
am: 764be066ba

Change-Id: Ib046ca04adb5d648eeee1deea666d1a136929965