Merge "Touch moves cursor in text refactored"