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