Merge "Adding select all on focus to folder renaming, changed spacing"