Merge "Fix cursor position calculation."