Merge "Import SettingsLib/Service library" into main