Merge "If the user only had the default db, then migrate to the new default" into main