Merge "Register HdmiControlService"