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