Feature/add speech incomplete timeout

Add support for speech-incomplete-timeout.

Update some logic and setup stuff to be consistent with mainline.