Sweeping !12340 from 21.1 to master. Fixing EtaPhiWindow algorithm with proper treatment of phi See merge request atlas/athena!12386 Former-commit-id: c1f3b3c5