Merge "libsnapshot: No transition of snapuserd during second stage init"