[FIX] ColorPicker HCB Grip focus issue

Change-Id: Ia17d4099fcf196113c186b074a47c28dc11050d0
Merge "[FIX] ColorPicker HCB Grip focus issue"