Merge "SF: recover from sub-frame jank V2" into main