Merge "Revert "init: Add diagnostics for snapuserd hangs""