Merge "Bug 5250788: EditText gets slower has the entered text gets longer"