Merge "Fix Watchdog HeartbeatHandler to run on correct thread"