[FIX] ColorPicker HCB border issue

Change-Id: I1bf2c35cdd910b242a70a5ba06f4e918b1dcd076
Merge "[FIX] ColorPicker HCB border issue"