Merge "Removing tracing for a fixed flake" into ub-launcher3-master