Merge "Wifi Watchdog: increase recovery coverage"