Merge "Adds scoped DeviceConfig reset support to RescueParty."