Merge changes from topic "am-c709fe3e-1c07-4ecd-9998-2477e3445dd4" into oc-dev

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a am: 8f85f5ffd2
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb
  Fix crash during cursor moving on BiDi text