Merge "Wait on aspect ratio change for flicker test" into main