Merge "Refactor display manager service to new pattern." into klp-modular-dev