Merge branch 'cherry-pick-5cbe56ab [formerly 45154d4c26]-master' into 'master'

Sweeping !11866 from 21.0 to master.
Increasing minimum hit requirements of silicon and pixel as 3 and 1 respectively.

See merge request atlas/athena!12124

Former-commit-id: e81dc8a1