(cherry picked from commit 81283dc5cfdf1c7623bcf480aad4e1645c0854fc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedTab.kt
(cherry picked from commit 81283dc5cfdf1c7623bcf480aad4e1645c0854fc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedTab.kt