Merge changes Ifec29546,Iaab1cc44 into pi-dev

* changes:
  Add metrics for battery tip
  Add metric for restrict app tip and high usage tip