Merge "Reduce screenshot size for failures"