Merge "modified settings to use settingslib class"