[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into pi-dev am: f052c26a7d
am: 8caff9fd7a  -s ours

Change-Id: I9a96c1f56866aaad0dd21ff0d6339ad3139a9eae