Merge "[Settings] Code Refactor"