Merge changes Ifa91ad93,I14f9696a into pi-dev

* changes:
  Update the BatteryTipPolicy
  Update and expose the low battery tip.