Merge pull request #21391 from etiennesegonzac/bug-1034347

Bug 1034347 - Bringing back the edge-candidate logic to prevent crazy overfill rate r=21