Merge "Check avalanche entry list when needed in BaseHeadsUpManager" into main