Merge "Rotate display layout if there is a delta present" into main