Merge "Update char limit for auto-sync data dialogs" into main