Merge "Fix issue with restored task display ids" into ub-launcher3-qt-dev