Merge "Retry the dir deletion if can't rename."