Merge "Change the strings on the opt-out toggle to also account for archiving." into main