Merge "MediaMetrics: Add typed property keys" into rvc-dev