Merge "MediaMetrics: Garbage collection fixes" into rvc-dev