Merge "wifi: Support for Wi-Fi Direct R2" into main