Merge change 6583 into donut

* changes:
  Adding a lock to stop so that stop will stop utterances that are just starting up.