Merge "Fix RefreshRateRangeTest"