Merge "Including full diags from system alerts" into ub-launcher3-master