Merge change 6608 into donut

* changes:
  Move the watchdog timer to a separate thread...