Merge "Update DumpRenderTree2 to handle failing tests where no meaningful diff is available"