Merge "Disable flaky test" into main