Merge "Settings injector sample activity" into klp-dev