[Backport 2.x] [Remote State] fix lock release before deletion is completed

[Backport 2.x] [Remote State] fix lock release before deletion is completed #21693