Merge "Prevent race in NetworkMonitorTest" into rvc-dev