Merge "Fix Resizing Flicker Tests - Transitions" into main