Ensure deviceType/token are populated from installation