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