Merge "Deprecating flags and settings resets in RescueParty" into main