Merge "Add gif mime type" into sc-dev