Merge "Move functions to settingslib for more code reuse"