19cdcdcab7
(cherry picked from commit ad49a02879)
# Conflicts:
# app/src/main/res/anim/fade_in_long.xml
# app/src/main/res/drawable/ic_broken_image_grey_24dp.xml