Update ColorPicker

Change-Id: If698784ff2983459292ad41a53977a198b6e9a04