(cherry picked from commit 710ebfb7a5e3b57a59103a50da462be1259f0d3b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt # app/src/main/res/layout/reader_activity.xml # app/src/main/res/layout/reader_general_settings.xml