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