From what I remember in other forum topics and from what @anon83191809 has said above you should do the upgrade with your encryption ON. From what I have read, encryption is currently not possible if you decrypted it before the upgrade: