Merge "Wifi: update p2p API usage in settings"