5b9d2175e2
(cherry picked from commit c255f57d95)
# Conflicts:
# app/src/main/res/layout/reader_general_settings.xml