Fix bug when setting color for multi-block data sets

This fixes a bug which occurs when the user clicks cancel in
the color chooser dialog when changing the color for a block.

Change-Id: I229896ce88c210a27a731f5d80e795daae969b93
Merge topic 'fix-multi-block-issues' into next

ebf184d Fix bug when setting color for multi-block data sets