Improved cie1931 color picker registration

Also swap color pickers when color model changes (e.g., from external
controllers) while popover open