(cherry picked from commit 89619b7836145130b4bf5d92ebc0f6fe70de7233) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
(cherry picked from commit ad57fde1c55984f3235ce86a7505e3675039b1dc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt # app/src/main/res/values/themes.xml