Merge "init: Combine two global sigchld_fd variables into one" into main