Merge "More improvements for wellbeing tests" into ub-launcher3-qt-dev