Merge "Use one-pane and two-pane layout instead of depending on orientation." into main