Merge "Only initialize sniffers once, don't hold mutex while sniffing" into klp-dev