Merge "SF: update consistent criteria for heuristic refresh rate calculation" into main