Merged PhotoService with DiscoverDevicesService