Merge "Add scenario data to Flicker assertion message" into main