Sweeping !9817 from 21.0 to master. LAr MC overlay fix for HEC See merge request atlas/athena!9892 Former-commit-id: 1bee0d79