Merge "Simplifying switching to home for some tests" into ub-launcher3-qt-r1-dev