Merge "Reintroduce @FlakyTest to flaky CallFeaturesSettings test"