Merge "Fix bug 4901543. Shadow now remains on FolderIcon after rename."