Merge "Fix EditText default selection while renaming file"