Merge "Fix missing tag in mediaserver ServiceManager: log"