Merge "Intent definition for HdmiControlService for OSD display"