[ticket/10948] Separate color swatch cells.

PHPBB3-10948
Merge remote-tracking branch 'prototech/ticket/10948' into develop

* prototech/ticket/10948:
  [ticket/10948] Separate color swatch cells.