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

Change-Id: Ia5c13d03de152fce287a1468e943b2a24f94a8f4