Merge "No-op refactoring of quitting NetworkMonitor in the test" into main