DEV: pass widget back when cleaning up stream (PR #9422)

GitHub

@eviltrout would you be ok with this? I think it will make easier to clean state in some cases.