Merge "Revert "Adding better diags when SysUI crashes during Launcher test"" into tm-dev