Merge "Plumb display state and interactive information to BatteryStats."