Merge "BatteryStats: force healthd update on screen on/off"