Merge "Fixed WifiWatchdog notification bugs"