Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev