Merge "Text selection: add some slop for moving between lines" into mnc-dev