Merge "p2p: support factory reset for P2P group"