fix deadlock on nested DropHelper (#15322)