(cherry picked from commit f6fdb12db220c45bfd4f7696d91ae059e3a285cd) # Conflicts: # app/src/main/res/menu/library_selection.xml
(cherry picked from commit f6fdb12db220c45bfd4f7696d91ae059e3a285cd) # Conflicts: # app/src/main/res/menu/library_selection.xml