Merge "Add service-state content provider"