Merge "Improve constant names for settings injection API" into klp-dev