Merge "Add service-media-s to merged stubs" into sc-dev