Merge "Unhide new BroadcastInfoRequest options" into main