Merge "Use extcon to listen for hdmi state changes"