Merge "Add unit test failure messages to recordingcanvas/reorderer"