Merge "Battery graph in QS Detail" into nyc-dev