Fix: Non user invoked playback stops not handled correctly.
Code cleanup