Merge "Revert "Start Wifi only after boot completes""