Merge "wifi: fix ADB URI doesn't work" into main