Merge "Revert "Update native watchdog to be triggered after 20 restarts instead of 4."" into main