Merge "Remove unused if condition for wpa_supplicant" into main