Merge "Fix and expand battery saver stats tracking."