Fix crash that happens if you call archive twice.

Also remove outdated TODO: We'll re-use the existing OP_CODE because
it's bad practice to have 2 OP_CODES that are controlled by the same
switch in settings. If they ever become out of sync the UI cannot handle
the state.

Bug: 314770049
Test: verified fix manually
Change-Id: I6a658a4c583c951795daf1f9a2cd9e7d26c3f44a
2 files changed