Merge "Fix only one battery stat showing sometimes." into nyc-dev