Instead of just checking for the zone outline, we adjust to check the full fill area of the zones for intersection and overlaps (cherry picked from commit 954b265839)
954b265839