(cherry picked from commit 9facb51f2213fc8dcc69739a4f731b15f5c7f1f6) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
(cherry picked from commit a93c0577acdf9fdc591087838ecb5a004d3acf81) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt # app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt # app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
(cherry picked from commit db2dd4b6c647dc01650b98472664a4e043f8f572) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt