Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev