Merge "Rework the per-network URL API." into lmp-dev