Merge "Prevent adding duplicate overlays" into main