Merge "snapuserd: Refactor daemon/server."