Merge "DisplayTopology: fix erroneous attach-to-corner" into main