
(cherry picked from commit 544adb9940bce8f42f9241c53785cb85192d533f) # Conflicts: # app/src/main/res/layout/reader_activity.xml
(cherry picked from commit 544adb9940bce8f42f9241c53785cb85192d533f) # Conflicts: # app/src/main/res/layout/reader_activity.xml