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