Merge "Update battery strings to respect user 24 hour setting" into pi-dev