Merge "Introduce a Lifecycle for system services" into klp-modular-dev