Merge "Fix missing early return." into ub-launcher3-qt-dev