Merge "Send cancel error when watchdog triggered" into 24D1-dev