Merge "More diags for b/129434166" into ub-launcher3-master