(cherry picked from commit 7401673ac1868cd468139a9e6d064c32ff8d1e8c) # Conflicts: # app/src/main/res/drawable/ic_file_download_black_24dp.xml
(cherry picked from commit 7401673ac1868cd468139a9e6d064c32ff8d1e8c) # Conflicts: # app/src/main/res/drawable/ic_file_download_black_24dp.xml