Merge "Add some error logs for FdTrigger errors" into main