(cherry picked from commit d3dadf71e8d7d029fdb87b44217e001f95f21c1a) (cherry picked from commit a163223d83e21f0dbcb74dc2887c4108f0f85449) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
(cherry picked from commit d3dadf71e8d7d029fdb87b44217e001f95f21c1a) (cherry picked from commit a163223d83e21f0dbcb74dc2887c4108f0f85449) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt