Merge "Fix flaky RefreshRateStatsTests"