Merge "Better handle notification uid resolution for missing pkgs"