Merge "Add a flag for deferring outgoing broadcasts" into main