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