Merge "Add broadcast lock for p2p listener APIs" into main