(cherry picked from commit 8ea05e852efd621ee987c7e45d6db64a083eeffd) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt (cherry picked from commit 09e5bcaec1916f4a2e846fc622749b092b10e994)
(cherry picked from commit 8ea05e852efd621ee987c7e45d6db64a083eeffd) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt (cherry picked from commit 09e5bcaec1916f4a2e846fc622749b092b10e994)