Merge "SF: clamp refresh rate to nearest bucket in TimeStats" into sc-dev