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