Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev