Fix build errors after rebase

Rishi Kumarrequested to merge
keys/tokodon:work/keys/image-support into work/sok/offline-tokodon

Merge request reports