Merge "Add service 'overlay' to service_contexts"