Merge "Do not expect validated when connect to Wi-Fi for upstream type None" into main