Merge "p2p: defer enabling p2p until the first command" into sc-dev