Merge: Fix fdroid