Merge "Update QS battery trendline to use theme color." into nyc-mr1-dev