Merge pull request #20513 from tonistiigi/retake-ref

Fix releasing reference on deletion error