Merge "Adding tracing for a lab-only flake" into ub-launcher3-master