Merge "Factor vertical split into menu position calculation." into main