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

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