Merge "Correctly update the z-order list on display move" into main