[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev am: 2cd112082b  -s ours
am: 8913a06329  -s ours

Change-Id: I1616145fb66d7adc6ede368e359d97fd60572a48