Merge "waitForIdle to avoid stubbing mocked bpfNetMaps while CS is accessing" into main