Merge "New UI theme for EditText."