Fix services stomping on each other's device tokens