Merge "Start Wifi only after boot completes"