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

Change-Id: I76150f75e2e27f39d7ba4909c2b193171785f7f3