Merge "Fix flaky testSampleConnectivityState" into main