Merge "Clearing selection when done editing folder name"