Merge "Add MEDIA_COMMUNICATION_SERVICE in Context.ServiceName" into sc-dev