Merge "Not trying to disable running tests after a failed finalizer" into ub-launcher3-master