
(cherry picked from commit 54733e6ceb541d314687f46f5a01cf2f08dec89e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
(cherry picked from commit 54733e6ceb541d314687f46f5a01cf2f08dec89e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt