Merge color property in a transaction

The LayerState.merge code didn't have colors getting merged

Test: Builds
Fixes: 206341593
Change-Id: Ic2721242c772099802f635f8019cb3b7a24d6c90
1 file changed