(cherry picked from commit 37d30eb887d0580fc98eb6a6fd5d6a08bc585721) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 37d30eb887d0580fc98eb6a6fd5d6a08bc585721) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt