[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
am: 732038d68e  -s ours

Change-Id: Ic09933171d7fd53a878458c91db9e67b74887130