Merge "TouchInputMapper: Extract method for moving the cursor"