Merge "Horizontal editor layout"