Merge "media: allow media server to add resource manager service"