Merge "TAPL: Little cleanup" into ub-launcher3-qt-dev