Merge "Remove the usage of TX_STATUS in HdmiControlService"