Merge "p2p: route events to P2P device"