Merge "[Settings] Fix failure test case"