Merge "Fixed black line highlighted issue in ColorPicker. Signed-off-by: Syed Khaja...