am 8dd41fb9: Merge "Don\'t wait indefinitely for audio tracks to finish playing."

* commit '8dd41fb992668b67db9a0899f5d1768680a55620':
  Don't wait indefinitely for audio tracks to finish playing.