State restoration opt-in