DEV-64557 - No design color selector on overlapping designs.
Merge remote-tracking branch 'origin/develop' into develop