Merge "Warn that SettingInjectorService must be fast" into klp-dev