(cherry picked from commit b152e3881bffd9050a8a0ed4030823886e3fe04f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt # core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt