Update layout for ColorPicker

Change-Id: I2f6758f0628052ae48ab0f1e56f8cc0c32680ccb