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