Fix testing issues with multi-block colors

This fixes issues in which events from the color chooser dialog
were not being properly recorded and played from test scripts.

Change-Id: I1fa0d2caf97da6faeeb24eb1a52e5a39b77270a7
Merge topic 'fix-multi-block-test' into next

9e61f8e Fix testing issues with multi-block colors