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

* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
  Maintain display power status for playback device