Merge "Fix re-entrant invalidation w/ HUNs + VisStability" into tm-dev