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