Merge "Add some tracing to the UNSTOPPED broadcast" into main