ColorPicker:With Swatches

Build 3716 on refactor/color-input-and-picker
Reviewing disabled
The baseline is taller than the new snapshot (290x280 to 290x261).
Baseline History
Build 37164161476
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