Merge "Add recoverability detection to RescueParty and PackageWatchdog" into main