Merge "Avoid unfinished MockitoSession if setUp has errors" into main