Merge "Avoid double-calling super.getText() in EditText.getText()"