Fixed bug on disposing streamlistener
Merge remote-tracking branch 'origin/master' into RemoveUpdater