Merge "Move around the HDMI switch detection so we don't try to get the status if we can't listen to it."