Un-prearm changes?

We recently migrated our customized code base from v1.9 to a v1.11 base and we have a peculiar issue with the prearm. We do use the safety switch on the GPS for prearm, and going into prearm -> arm -> takeoff work without issue, however after we land we always then disarmed and then “un-prearmed” after that using the GPS switch. This doesn’t seem to work anymore. We can’t get back to the pre-prearmed state with the GPS switch.

Are there any code or configuration changes we might have missed between 1.9 and 1.11 that come to mind for anyone?