3fdd433d89
(cherry picked from commit 7094fef37f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt
# app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt
# app/src/main/res/layout/pref_widget_imageview.xml