Merge "Fix HUN stale state on dismiss" into tm-qpr-dev