3c3f5cf35d
(cherry picked from commit d501c02f8b)
# Conflicts:
# app/src/main/res/layout/reader_activity.xml
(cherry picked from commit d501c02f8b)
# Conflicts:
# app/src/main/res/layout/reader_activity.xml