[[ Bug 12946 ]] Stop the sound when asked to or when it finishes playing.
Merge branch 'bugfix-12946' into develop