Merge "Improving TAPL diags" into ub-launcher3-master