Merge "Use MonitorThreadLeak in ConnectivityService tests" into main