Handle when sink buffer is killed.
Merge branch 'kill-sink-buffer'