Adding new release-4.0 branch for gsb_feature_media_item_display