Merge "Revert "Add basic support for Ctrl-Z to editable TextViews""