Merge "Merge branch 'ub-launcher3-qt-r1-dev' into ub-launcher3-qt-dev" into ub-launcher3-qt-dev