Merge "SF: Adding dynamic switching between 30 and 60 Hz in Scheduler."