Merge "Fix crash during cursor moving on BiDi text" into pi-dev
am: f052c26a7d

Change-Id: I18123e7e08220b1483df6fd32ec0eecd68bb38de