Merge "Update battery dashboard based on spec"