Merge "Adapt to SettingsInjectorService API changes" into klp-dev