Fix merging of edits in inline color editor
Merge pull request #7124 from adobe/nj/cmv4-color-edit-merging

[cmv4] Fix merging of edits in inline color editor