Merge "Battery stats: track actually running time"