Merge "Various battery info things:" into gingerbread