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