Merge "Not showing "mismatched events" and other diags after Launcher crashes" into ub-launcher3-master