Merge "Fix cursor's position when there is no text and the width is > 1." into devel...