(cherry picked from commit eef39b75a64db369b18adc963f6ea3952d0b4aac) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
(cherry picked from commit eef39b75a64db369b18adc963f6ea3952d0b4aac) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt