Merge "Fix accounting bug in BatteryStatsImpl." into qt-dev