Merge "StreamOut: use atomic_sp<> for callback thread safety"