Merge "Fix cursor position after delete gesture"