Show battery % while discharging and when 'connect to charger' displays

Change-Id: I5d96265f5e0125f7ac8b7e249220ebee33ecd5c2