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