Merge "Improving events checks diags" into ub-launcher3-master