Citrix support answer after bumping between support and licensing teams was all NFR licenses were now demo and there was no differentiation for Partner internal use so just live with the nag screen for internal users. Still can't believe this is right, as would have be a change that would have thought would have been communicated to partners and added to the program guide. Tested the sessionmsg.exe lockdown and works well as a workaround for published apps, but weirdly broke the start menu on server 2022 published desktop.

Good to have that confirmed, thanks Aaron