(cherry picked from commit 0e19c245e9aaeb2da88722e7f5816cfddece8777) # Conflicts: # app/src/main/res/menu/category_selection.xml # app/src/main/res/menu/chapter_selection.xml # app/src/main/res/menu/library.xml # app/src/main/res/menu/library_selection.xml