Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev