Merge "SF: Short-circuit late touch boost" into main