Merge "Avoid obsolete uid-state change evaluations in NPMS" into main