Merge "Updating assets, fixing Battery tile to show proper states." into jb-mr1-dev