Merge "[Settings] Fix test failure of WFC group" into sc-dev