Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev