Merge "MediaMetrics: Misc fixes" into rvc-dev