Merge changes Ib8f43601,I61d82dca into pi-dev

* changes:
  Show battery percentage on indication field
  Revert "Show battery percentage on indication field"