Merge "Connectivity: remove usages of deprecated Mockito matchers" into main