main
Don't send device list updates upon registration (#3307)
Merge both user API databases into one (#2186)