Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev