Merge "Fix crash issue arising out of multiple hdmi connect/disconnects"