NXP-12226: avoid unneeded save() in UnrestrictedSessionRunner
NXP-12226: for backport, only activate if explicitely configured for