Merge "Allow DeviceStateProvider to provide optional String name for device states." into sc-dev