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

Change-Id: I30ccfceb08f5a4ebb4748d64f465fc930fd5f8b7