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

Change-Id: I45e63ae5c187baa01868809914a7e7ff9923f447