
(cherry picked from commit 9957fff2fbb6dad6f9df89bb2c16db34d9e4da96) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 9957fff2fbb6dad6f9df89bb2c16db34d9e4da96) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt