Merge "WifiWatchdogService refactor"