Merge "Track replaced metrics during config update"