Merge "MediaMetrics: Use variant instead of union for properties"