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