Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev