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