CLC-4322 (QA) Fix persistence logic for opt-in/out

https://jira.ets.berkeley.edu/jira/browse/CLC-4322

QA branch version of #3020