Merge "Remove flaky from default excluded tests" into sc-dev