ColorPicker:With Swatches

Build 3712 on refactor/color-input-and-picker
Reviewing disabled
The baseline is shorter than the new snapshot (290x280 to 290x285).
Baseline History
Build 3712c5d3944
Current build. There are unaccepted changes, so build 3706 is still the baseline.
Commenting is disabled because there's a newer build on this branch