Update colorpicker from slims

Change-Id: I9ae92370cfdeb91bda6a4e628c0755b1a45917be