Merge "[Settings] Code Refactor for performance"