Merge "Refactoring Animated image loading" into devel/master