Merge "Restart wificond when zygote died"