Merge "[Settings] Fix test case"