Merge "Improvement to tap detection for the delete button."