Merge "Added dialog to notify user of thermal shutdown" into oc-dev am: 4d09adcef1
am: ba1cc4bb42

Change-Id: I6d0a0c6dc87bac1470eb4cfccee61c878bed9ee3