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