Merge "MediaMetrics: improve API coverage" into sc-dev