Merge "incidentd: fix race in waitpid_with_timeout" into tm-dev