Merge "Add more diags for b/117332845" into ub-launcher3-master