Merge "Add media.resource_observer to service contexts"