Merge "Revert^5 "Conditional start the media.transcoding service.""" into sc-dev