Merge "Fix crash during cursor moving on BiDi text" into oc-dev
am: e385255db4

Change-Id: Ib094039b1c515af77fcc3c051352de5cb15861cb