Allow stop & destroy to be invoked multiple times

[#78231674]
Auto-merge remote-tracking branch 'upstream/master'