Merge "Battery meter now functioning in the system bar and settings panel."