Merge "More consistently retry system calls on EINTR" into sc-dev