Merge "Mock QuiConnectionCloser in ConnectivityServiceTest" into main