Merge "Ensure device-info is run in retry too" into pi-dev