Merge "Added dialog to notify user of thermal shutdown" into oc-dev