[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-dev am: e385255db4
am: 06829a62b1  -s ours

Change-Id: I9563f6fc8afa112e8a8455ffde9a221432cbcbf9