Merge "Fix for framework reboot on connecting to TV through HDMI."