Merge "Support 'preferred' as ID for the preferred email address of a user"