am b71fe052: Merge "Fix destroy race condition"

* commit 'b71fe052ab39f1adc5a1a559432b803679a2a027':
  Fix destroy race condition