Merge "[Settings] Code refactor for performance"