Merge "Implement issue #3326435: Battery stats improvements"