Fix Color Picker HOLO button to match the other ColorPicker buttons

Change-Id: I62c12fc5d1eaf06dd89215bdcf21d8b058bb1c4a
Merge "Fix Color Picker HOLO button to match the other ColorPicker buttons" into jb42