Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev