Merge "Rename two targets to have SettingsLib prefix"