38f1af7577
(cherry picked from commit c95a269460)
# Conflicts:
# app/src/main/res/layout/source_comfortable_grid_item.xml
# app/src/main/res/layout/source_compact_grid_item.xml