ColorPicker Update

Change-Id: I533fdc9eb28773ff3b724e77a002bf1bec96824f