Merge "Clean up open/close state for DragLayout." into ub-calculator-euler