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