EditText changes
(cherry picked from commit 5cd7b29)