Merge "EncryptInPlace: ensure that backup superblocks get encrypted" into rvc-qpr-dev