Merge "Handle losing Active Source to non-CEC device"