Merge "Fix incidentd skip collecting timedout of a section." into pi-dev