MS-442: fix horizontal scrolls during scrollback from breaking it
Merge branch 'develop' of http://github.com/myplanetdigital/neompd into MS-442-scrollback-bug
Merge remote-tracking branch 'origin/develop' into MS-442-scrollback-bug
Merge remote-tracking branch 'origin/MS-442-scrollback-bug' into develop

* origin/MS-442-scrollback-bug:
  MS-442: fix horizontal scrolls during scrollback from breaking it