Merge "MediaMetrics: Fix clang-tidy warnings" into rvc-dev