Merge "Add touch feedback to edit text"