Merge "Clean up TranscodeMetrics" into sc-dev