Merge "[Settings] Fix unit test"