Merge "Revert "[hotword] fix race condition in destroy()"" into main