Merge "Update SettingsLib resource and fix lint warning" into main