Ensure OnEnter and ModeSwitched are called "in the new mode"