Merge "Plumb display power state through display manager." into klp-modular-dev