Merge "Fix references to resources for SettingsLib" into main