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

Change-Id: I5e544ae0b26358463ea0afded0110077cecb4a86