Merge "BatteryMeterView: Charging trumps empty." into klp-dev