Merge "Move batterystats stats collection to its own thread" into nyc-dev