Merge "More readable formatting for events mismatch message" into ub-launcher3-master