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

* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
  Maintain display power status for playback device