Merge "Merge "Revert "init: Add more diagnostics for signalfd hangs."" am: fa4926a9de" into main-16k