Merge "[sf] Update framerate correctly with new frontend" into main