Merge "Disable flaky pip test" into sc-dev