automerge: 23ac13c
* commit '23ac13c6b95c15d029426ff8424f7f6f23bf0220':
CEC: Pass port ID for set_audio_return_channel
automerge: 23ac13c
* commit '23ac13c6b95c15d029426ff8424f7f6f23bf0220':
CEC: Pass port ID for set_audio_return_channel