Merge "MediaMetrics: Fix wait_until(max) for condition_variable" into main