Merge "moved shared classes from settings to settingslib"