Merge "Ignore older UID state change callbacks in NPMS." into tm-dev