Resolve "Improve kick (spin) detection robustness"

Closes #1639

See merge request main/Sumatra!1383

sumatra-commit: b7e5a81690e5b42e5dbe843e3663f05f8996861b
2 jobs for master in 4 minutes and 9 seconds (queued for 2 seconds)