Merge "Fix for framework reboot on connecting to TV through HDMI."
am: 7585cbfd34

* commit '7585cbfd34a46bc8332bf066a5d0f69677d3a7e1':
  Fix for framework reboot on connecting to TV through HDMI.