Merge "Fix transitions between single and multi-pane."