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