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