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