Merge "update package watchdog to perform mitigations after every reboot once threshold is reached." into main