Fix merge conflicts with stop-stream button