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