Merge "Make remove-previous-digit logic aware of cursor position"