Merge "SF: Remove Scheduler::setRefreshSkipCount"