Merge "Fix potential inconsistent DragLayout state" into ub-calculator-euler