(cherry picked from commit 1d7c692e89120856d9e65d3e39c0248e3a04c9f6) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
(cherry picked from commit 1d7c692e89120856d9e65d3e39c0248e3a04c9f6) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt