Merge "Wifi: Remove early setting of driver status to ok"