Merge "SF: Remove misleading pacesetter choice fallback" into main