Merge "Revert "Revert "SF: opportunistically try to present the next vs..."" into main