Merge "Not crashing tests when a test fails to deinitialize" into ub-launcher3-master