Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev