Merge "Fix potential FD leak with PhantomProcessRecord bookkeeping" into sc-dev