Merge "init: Add diagnostics for snapuserd hangs"