Merge "Add a Settings value to store emegency thermal alert state" into main