Merge "[Settings] Re-enable test case"