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