am 5dcdd4ea: am 88985bfa: Merge "Fix a bug where the cursor pos wouldn\'t be tracked correctly" into jb-mr1-dev

* commit '5dcdd4eab5155f5f317cae578d44b5018bb751b9':
  Fix a bug where the cursor pos wouldn't be tracked correctly