Merge "Removing diagnostics" into ub-launcher3-master