Merge "Make invalid FD a fatal error in FdTrigger" into main