Merge "Support changes in Settings for battery graph" into nyc-dev