Merge "Deprecate isConnectedToHdmiSwitch"