Merge "Safe check so we don\'t move cursor beyond possible pos scope." into nyc-dev
am: 2360aa3

* commit '2360aa33db829121a25be271edbaaaf26e5b093e':
  Safe check so we don't move cursor beyond possible pos scope.

Change-Id: Iec159a552b3311805f6d3be0b33ce51efa2a36cb