Merge "Increase BatteryStats delay"