Merge "Better Handling of Battery Stats History Overflow"