Merge "Add the badged icon for Movies & TV." into oc-dev