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

Change-Id: I3990f8533376209673b25f714e154bd94147b91b