Merge "Fix and update battery detail page" into nyc-dev