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