Merge "Import SettingsLib/Preference library" into main