Merge "Fix race when starting NetworkMonitor"