Merge "Add support for popups overlapping anchors"