Merge "(Text Decorator) Remove Image class Usage" into devel/master