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

Change-Id: If5fc0ad9ec33b18445778cc1f91f469eac1ed565