Merge "Reduce RC table contention for file deletion"