Merge "Add flicker tests for the minimize button" into main