Merge "Update screebshot diff tests to make the tests more stable."