Merge "Prevent putting any stage on top if split is not visible when breaking pair" into main