Update ColorPickerPreference
Fix build error
Merge remote-tracking branch 'xy/jellybean' into franco