Merge "Harden NsdManager against null-dereference crashes" into klp-dev