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

Change-Id: Iff0442792a3a73e1e1cf950ff2db36ece0d9fbea