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

Change-Id: I117ce5837eff2fdc346b990721414cb4c13c22fe