Merge "init: Wait for snapuserd before starting second stage"