Merge "Take screenshot upon test failure" into main