Merge "Disable tests flaky on flame" into sc-dev