Merge "Visual updates to battery screen" into nyc-dev