Merge "Rearm pdx fd on errors" into pi-dev