GearSwap: Refine status guards to be sure we get a valid new status.
Merge pull request #670 from Kinematics/4.1-dev

GearSwap: Refine status guards to be sure we get a valid new status.