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