Merge "Add more test diags" into ub-launcher3-qt-dev