ac4befdb51
(cherry picked from commit 4d9d587366)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt