Merge "[SF] Update to use updateRefreshRateOverlayRate from setActiveMode" into main