Merge branch 'hotfix/image_scale'
Makes sure animated images are scaled to the width of the device.
Merge branch 'hotfix/animated_image_size' into develop