Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0