Merge "Address API Review for SettingInjectorService" into klp-dev