Merge "charger: screen blank on disconnect and 0% not displayed"
am: 157a2e7341

Change-Id: I5534867d6f43a5a62a09b2f0af91f03f08c9fce7