Merge "p2p: add overlay to customize the default device name." into sc-dev