Merge "CEC: Remove the TODO in HdmiPlaybackClient class"