Merge "Fix runtime restart when using aggregated net observers." into nyc-dev