(cherry picked from commit 418e6a8b3ac23c235e392fe64314a2e4994e209b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
(cherry picked from commit 0b125b7106570841a100b6a4b504533386315bbe) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt