Merge "Filter out uninteresting UidObserver callbacks in NPMS" into main