Merge "Allow snapuserd to inotify watch /dev/socket."