Merge "Maintain display power status for playback device" into klp-modular-dev