Merge "[Flicker] Add pip aspect ratio test" into main