Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev