Merge changes Ie4c98617,I6a7248d9

* changes:
  Add BatteryTipDialogFragment.
  Add high usage battery tip