Ensure card_state class persists across country changes. Closes #2576