Merge changes Ifaf76304,Ia2404d43 into tm-qpr-dev

* changes:
  [Dock Defend] Include the current overheated status in the battery dump.
  [Battery] Minor updates to content descriptions when there's an estimate.