Merge "Revert "[Settings] Ignore some failure test cases""