Merge "Make process level rotated config and display metrics consistent"