Merge "Clean up flag network_metric_monitor" into main