Merge "Wifi: revise P2P API"