Merge "additional codec-related media metrics" into sc-dev