Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-mr2-dev

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5 am: 7693ce7e
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7
  Fix crash during cursor moving on BiDi text